diff --git a/files/system/usr/lib/systemd/system/nix-overlay.service b/files/system/usr/lib/systemd/system/nix-overlay.service
index df9b154..fca9a70 100644
--- a/files/system/usr/lib/systemd/system/nix-overlay.service
+++ b/files/system/usr/lib/systemd/system/nix-overlay.service
@@ -2,13 +2,14 @@
 Description=Mount OverlayFS for /nix
 DefaultDependencies=no
 After=local-fs.target
-Before=nix-daemon.service
+Before=systemd-tmpfiles-setup.service nix-daemon.service nix-daemon.socket
 ConditionPathExists=/usr/bin/mount-nix-overlay.sh
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/mount-nix-overlay.sh
+ExecStartPost=/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/nix-daemon.conf
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index 364fab8..82f2645 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -27,6 +27,7 @@ modules:
       enabled:
         - nix-overlay.service
         - nix-daemon.service
+        - nix-daemon.socket
 
   - type: dnf
     repos: