diff --git a/flake.nix b/flake.nix
index 7e7e25f..f5a6b59 100644
--- a/flake.nix
+++ b/flake.nix
@@ -187,20 +187,19 @@
       ls = imports: { inherit imports; };
       hw = nixos-hardware.nixosModules;
       amd         = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-amd ];
-      intel       = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel ];
+      intel       = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel ./hardware/gpu/intel.nix ];
       intel-novga = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel-cpu-only ];
-      sandy       = hw.common-cpu-intel-sandy-bridge;
-      cuda        = hw.common-gpu-nvidia-nonprime;
-      cuda-prime  = hw.common-gpu-nvidia;
-      rocm        = hw.common-gpu-amd;
+      cuda        = ls [ ./hardware/gpu/cuda.nix hw.common-gpu-nvidia-nonprime ];
+      cuda-prime  = ls [ ./hardware/gpu/cuda.nix hw.common-gpu-nvidia ];
+      rocm        = ls [ ./hardware/gpu/rocm.nix hw.common-gpu-amd ];
       hidpi       = hw.common-hidpi;
+      p1005       = ./hardware/printer/hp-laserjet-p1005.nix;
     in {
-      # TODO: move nixos-hardware imports to the nixos configs?
       #attrpath        "hostname"    "domain"    "system"        inputs      "state" [ modules ... ]
       noximilien  = mk "noximilien"  "pbsds.net" "x86_64-linux"  inputs-2311 "22.11" [ intel ];
       brumlebasse = mk "brumlebasse" "pbsds.net" "x86_64-linux"  inputs-2311 "23.11" [ amd ];
-      nord        = mk "nord"        "pbsds.net" "x86_64-linux"  inputs-2305 "22.11" [ intel-novga sandy rocm hidpi ];
-      sopp        = mk "sopp"        "pbsds.net" "x86_64-linux"  inputs-2305 "23.05" [ intel cuda ];
+      nord        = mk "nord"        "pbsds.net" "x86_64-linux"  inputs-2305 "22.11" [ intel-novga hw.common-cpu-intel-sandy-bridge rocm hidpi ];
+      sopp        = mk "sopp"        "pbsds.net" "x86_64-linux"  inputs-2305 "23.05" [ intel cuda p1005 ];
       bolle       = mk "bolle"       "pbsds.net" "x86_64-linux"  inputs-2311 "23.11" [ intel ];
       eple        = mk "eple"        "pbsds.net" "x86_64-linux"  inputs-2311 "23.11" [ intel ];
       garp        = mk "garp"        "pbsds.net" "x86_64-linux"  inputs-2311 "23.11" [ intel-novga cuda ];
diff --git a/hosts/garp/default.nix b/hosts/garp/default.nix
index d81465b..c5377cb 100644
--- a/hosts/garp/default.nix
+++ b/hosts/garp/default.nix
@@ -20,8 +20,6 @@
 
   imports = [
     ./hardware-configuration.nix
-    ../../hardware/gpu/cuda.nix
-    #../../hardware/gpu/intel.nix
     ../../profiles/auto-upgrade.nix
     ../../profiles/upgrade-diff.nix
     ../../profiles/sshd.nix
diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix
index 02c2b9b..fb859a3 100644
--- a/hosts/nord/default.nix
+++ b/hosts/nord/default.nix
@@ -15,8 +15,6 @@
 
   imports = [
     ./hardware-configuration.nix
-    ../../hardware/gpu/rocm.nix
-    ../../hardware/gpu/intel.nix
     ../../profiles/auto-upgrade.nix
     ../../profiles/upgrade-diff.nix
     ../../profiles/sshd.nix
diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix
index 7b1a858..d6e367d 100644
--- a/hosts/noximilien/default.nix
+++ b/hosts/noximilien/default.nix
@@ -6,7 +6,6 @@
   boot.loader.grub.useOSProber = true;
   imports = [
     ./hardware-configuration.nix
-    ../../hardware/gpu/intel.nix
     ../../profiles/auto-upgrade.nix
     ../../profiles/upgrade-diff.nix
     ../../profiles/sshd.nix
diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix
index 8007d15..76f44ef 100644
--- a/hosts/sopp/default.nix
+++ b/hosts/sopp/default.nix
@@ -22,9 +22,6 @@
 
   imports = [
     ./hardware-configuration.nix
-    ../../hardware/gpu/cuda.nix
-    ../../hardware/gpu/intel.nix
-    ../../hardware/printer/hp-laserjet-p1005.nix
     ../../profiles/auto-upgrade.nix
     ../../profiles/upgrade-diff.nix
     ../../profiles/sshd.nix