diff --git a/hosts/kuro/default.nix b/hosts/kuro/default.nix
index b39a02a7..ed972261 100644
--- a/hosts/kuro/default.nix
+++ b/hosts/kuro/default.nix
@@ -46,16 +46,6 @@
       emacs.enable = true;
       vim.enable = true;
     };
-    hardware = {
-      audio.enable = true;
-      ergodox.enable = true;
-      fs = {
-        enable = true;
-        ssd.enable = true;
-      };
-      nvidia.enable = true;
-      sensors.enable = true;
-    };
     shell = {
       bitwarden.enable = true;
       direnv.enable = true;
diff --git a/hosts/kuro/hardware-configuration.nix b/hosts/kuro/hardware-configuration.nix
index bd9f04c4..361c42ba 100644
--- a/hosts/kuro/hardware-configuration.nix
+++ b/hosts/kuro/hardware-configuration.nix
@@ -17,6 +17,18 @@
     ];
   };
 
+  # Modules
+  modules.hardware = {
+    audio.enable = true;
+    ergodox.enable = true;
+    fs = {
+      enable = true;
+      ssd.enable = true;
+    };
+    nvidia.enable = true;
+    sensors.enable = true;
+  };
+
   # CPU
   nix.maxJobs = lib.mkDefault 16;
   powerManagement.cpuFreqGovernor = "performance";
diff --git a/hosts/shiro/default.nix b/hosts/shiro/default.nix
index 8852014a..687353d1 100644
--- a/hosts/shiro/default.nix
+++ b/hosts/shiro/default.nix
@@ -40,13 +40,6 @@
       vim.enable = true;
     };
     dev = {};
-    hardware = {
-      audio.enable = true;
-      fs = {
-        enable = true;
-        ssd.enable = true;
-      };
-    };
     shell = {
       bitwarden.enable = true;
       direnv.enable = true;
@@ -54,9 +47,6 @@
       gnupg.enable = true;
       tmux.enable = true;
       zsh.enable = true;
-    };
-    hardware = {
-
     };
     services = {
       # syncthing.enable = true;
diff --git a/hosts/shiro/hardware-configuration.nix b/hosts/shiro/hardware-configuration.nix
index 8e12e830..d27402eb 100644
--- a/hosts/shiro/hardware-configuration.nix
+++ b/hosts/shiro/hardware-configuration.nix
@@ -21,6 +21,15 @@
     kernelParams = [ "mitigations=off" ];
   };
 
+  # Modules
+  modules.hardware = {
+    audio.enable = true;
+    fs = {
+      enable = true;
+      ssd.enable = true;
+    };
+  };
+
   # CPU
   nix.maxJobs = lib.mkDefault 8;
   hardware.cpu.intel.updateMicrocode = true;