diff --git a/flake.nix b/flake.nix
index 548f022..a24cabc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
     };
   };
 
-  outputs = inputs@{ nixpkgs, nixos-hardware, ... }: {
+  outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
       kami = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -86,12 +86,6 @@
           ./systems/kami
           ./modules
           ./overlays
-          nixos-hardware.nixosModules.common-cpu-intel
-          nixos-hardware.nixosModules.common-gpu-intel
-          nixos-hardware.nixosModules.common-gpu-nvidia
-          nixos-hardware.nixosModules.common-pc
-          nixos-hardware.nixosModules.common-hidpi
-          nixos-hardware.nixosModules.common-pc-ssd
         ];
       };
       yokai = nixpkgs.lib.nixosSystem {
@@ -101,7 +95,6 @@
           ./systems/yokai
           ./modules
           ./overlays
-          nixos-hardware.nixosModules.pine64-pinebook-pro
         ];
       };
       inugami = nixpkgs.lib.nixosSystem {
@@ -111,7 +104,6 @@
           ./systems/inugami
           ./modules
           ./overlays
-          nixos-hardware.nixosModules.raspberry-pi-4
         ];
       };
       tuny = nixpkgs.lib.nixosSystem {
@@ -120,10 +112,6 @@
         modules = [
           ./systems/tuny
           ./modules
-          nixos-hardware.nixosModules.common-cpu-intel
-          #nixos-hardware.nixosModules.common-gpu-nvidia
-          nixos-hardware.nixosModules.common-pc-laptop
-          nixos-hardware.nixosModules.common-pc-laptop-hdd
         ];
       };
       steamdeck = nixpkgs.lib.nixosSystem {
diff --git a/systems/inugami/default.nix b/systems/inugami/default.nix
index 897ba6d..e60421a 100644
--- a/systems/inugami/default.nix
+++ b/systems/inugami/default.nix
@@ -1,7 +1,10 @@
-{ modulesPath, lib, ... }:
+{ modulesPath, lib, nixos-hardware, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    nixos-hardware.nixosModules.raspberry-pi-4
+  ];
 
   boot = {
     initrd = { availableKernelModules = [ "xhci_pci" ]; };
diff --git a/systems/kami/default.nix b/systems/kami/default.nix
index c0e3a45..456b29a 100644
--- a/systems/kami/default.nix
+++ b/systems/kami/default.nix
@@ -1,7 +1,15 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, nixos-hardware, ... }:
 
 {
-  imports = [ ./hardware.nix ];
+  imports = [
+    ./hardware.nix
+    nixos-hardware.nixosModules.common-cpu-intel
+    nixos-hardware.nixosModules.common-gpu-intel
+    nixos-hardware.nixosModules.common-gpu-nvidia
+    nixos-hardware.nixosModules.common-pc
+    nixos-hardware.nixosModules.common-hidpi
+    nixos-hardware.nixosModules.common-pc-ssd
+  ];
 
   jopejoe1 = {
     audio = {
diff --git a/systems/tuny/default.nix b/systems/tuny/default.nix
index eac596a..ac6caf2 100644
--- a/systems/tuny/default.nix
+++ b/systems/tuny/default.nix
@@ -1,7 +1,13 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./hardware-configuration.nix ];
+  imports = [
+    ./hardware-configuration.nix
+    nixos-hardware.nixosModules.common-cpu-intel
+    nixos-hardware.nixosModules.common-gpu-nvidia
+    nixos-hardware.nixosModules.common-pc-laptop
+    nixos-hardware.nixosModules.common-pc-laptop-hdd
+  ];
 
   jopejoe1 = {
     audio = { enable = true; };
diff --git a/systems/yokai/default.nix b/systems/yokai/default.nix
index d3b8cf5..5b4193c 100644
--- a/systems/yokai/default.nix
+++ b/systems/yokai/default.nix
@@ -1,7 +1,10 @@
-{ config, pkgs, ... }:
+{ config, pkgs, nixos-hardware, ... }:
 
 {
-  imports = [ ./hardware.nix ];
+  imports = [
+    ./hardware.nix
+    nixos-hardware.nixosModules.pine64-pinebook-pro
+  ];
 
   jopejoe1 = {
     audio = { enable = true; };