diff --git a/hosts/detritus/user/default.nix b/hosts/detritus/user/default.nix
index 7f8f4e27..834704d5 100644
--- a/hosts/detritus/user/default.nix
+++ b/hosts/detritus/user/default.nix
@@ -1,10 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
   home-manager.users."${config.vars.mainUser}" = {
     home = {
       desktop.enable = true;
       gaming.enable = true;
-      stateVersion = lib.mkForce config.system.stateVersion;
     };
 
     wayland.windowManager.sway.package = pkgs.swayfx;
diff --git a/hosts/hidden/user/default.nix b/hosts/hidden/user/default.nix
index 129d9409..60e0e93a 100644
--- a/hosts/hidden/user/default.nix
+++ b/hosts/hidden/user/default.nix
@@ -1,8 +1,7 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   home-manager.users."${config.vars.mainUser}".home = {
     desktop.enable = true;
     school.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/intuos/user/default.nix b/hosts/intuos/user/default.nix
index ad39df5c..256a66ed 100644
--- a/hosts/intuos/user/default.nix
+++ b/hosts/intuos/user/default.nix
@@ -1,8 +1,7 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   home-manager.users."${config.vars.mainUser}".home = {
     desktop.enable = true;
     production.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/jupiter/user/default.nix b/hosts/jupiter/user/default.nix
index 0298f932..43b57345 100644
--- a/hosts/jupiter/user/default.nix
+++ b/hosts/jupiter/user/default.nix
@@ -1,9 +1,8 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   home-manager.users."${config.vars.mainUser}".home = {
     guifull.enable = true;
     school.enable = true;
     enableNixpkgsReleaseCheck = false;
-    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index a7183534..747ee8eb 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -5,7 +5,6 @@
     ./disko
     ./filesystems
     ./hardware
-    ./user
   ];
 
   system = {
diff --git a/hosts/kitty/user/default.nix b/hosts/kitty/user/default.nix
deleted file mode 100644
index f07f3b38..00000000
--- a/hosts/kitty/user/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}
diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix
index b0dc29cf..7ae69555 100644
--- a/hosts/midas/default.nix
+++ b/hosts/midas/default.nix
@@ -7,7 +7,6 @@
     ./hardware
     ./network
     ./services
-    ./user
   ];
 
   system = {
diff --git a/hosts/midas/user/default.nix b/hosts/midas/user/default.nix
deleted file mode 100644
index f07f3b38..00000000
--- a/hosts/midas/user/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}
diff --git a/hosts/prophet/boot/default.nix b/hosts/prophet/boot/default.nix
index e21b5c06..7b5230b7 100644
--- a/hosts/prophet/boot/default.nix
+++ b/hosts/prophet/boot/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   boot = {
+    binfmt.emulatedSystems = [ "x86_64-linux" ];
     kernelPackages = pkgs.linuxPackages_hardened;
     loader.systemd-boot.enable = true;
   };
diff --git a/hosts/prophet/default.nix b/hosts/prophet/default.nix
index ec4b498b..5f2196a5 100644
--- a/hosts/prophet/default.nix
+++ b/hosts/prophet/default.nix
@@ -6,7 +6,6 @@
     ./filesystems
     ./hardware
     ./services
-    ./user
     (modulesPath + "/profiles/headless.nix")
   ];
 
diff --git a/hosts/prophet/user/@! b/hosts/prophet/user/@!
deleted file mode 100644
index f07f3b38..00000000
--- a/hosts/prophet/user/@!
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}
diff --git a/hosts/prophet/user/default.nix b/hosts/prophet/user/default.nix
deleted file mode 100644
index f07f3b38..00000000
--- a/hosts/prophet/user/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}
diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix
index 25e12301..a71f03cf 100644
--- a/hosts/tower/boot/default.nix
+++ b/hosts/tower/boot/default.nix
@@ -18,9 +18,6 @@ in {
 
     # Secure boot
     lanzaboote.enable = true;
-
-    # Emulate different architectures for remote builds
-    binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
 
   # Use second GPU on boot
diff --git a/hosts/tower/user/default.nix b/hosts/tower/user/default.nix
index 3eaf7dc9..0f9048b5 100644
--- a/hosts/tower/user/default.nix
+++ b/hosts/tower/user/default.nix
@@ -1,11 +1,7 @@
 { config, lib, ... }:
 {
   home-manager.users."${config.vars.mainUser}" = {
-    home = {
-      guifull.enable = true;
-      stateVersion = lib.mkForce config.system.stateVersion;
-    };
-
+    home.guifull.enable = true;
     services.swayidle.enable = lib.mkForce false;
   };
 }
diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix
index dcc831c6..6a28ec62 100644
--- a/modules/system/users/main/default.nix
+++ b/modules/system/users/main/default.nix
@@ -44,5 +44,8 @@
     uid = 1000;
   };
 
-  home-manager.users."${config.vars.mainUser}" = import ../../../home;
+  home-manager.users."${config.vars.mainUser}" = {
+    imports = [ ../../../home ];
+    home.stateVersion = lib.mkForce config.system.stateVersion;
+  };
 }