diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
index 69baa7f..50919e1 100644
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, lib, ... }: {
   imports = [ ./dbus ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
 
   services.journald.extraConfig = ''
@@ -10,10 +10,14 @@
   '';
 
   systemd.services.systemd-user-sessions = {
-    after = let
-      # Fall back to an empty list if it's somehow not defined yet
-      currentAfter = config.systemd.services.systemd-user-sessions.after or [];
-    in
-      builtins.filter (service: service != "network.target") currentAfter;
+    after = lib.mkForce ([
+      "system.slice"
+      "systemd-journald.socket"
+      "sysinit.target"
+      "remote-fs.target"
+      "nss-user-lookup.target"
+      "home.mount"
+      "basic.target"
+    ] ++ map (user: "home-manager-${user.username}.service") config.syscfg.users);
   };
 }