diff --git a/flake.nix b/flake.nix
index 409c4893..0cc0259b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -162,7 +162,6 @@
       hw-common-intel-cpu = import ./hwModules/common/cpu/intel;
       hw-common-intel-gpu = import ./hwModules/common/gpu/intel;
       hw-common-laptop = import ./hwModules/common/laptop;
-      hw-common-laptop-amd-gpu = import ./hwModules/common/laptop/amd-gpu.nix;
       hw-common-laptop-intel-cpu = import ./hwModules/common/laptop/intel-cpu.nix;
       hw-common-ssd = import ./hwModules/common/ssd;
       hw-framework-13-amd-7000 = import ./hwModules/framework/13/amd-7000;
diff --git a/hwModules/common/laptop/amd-gpu.nix b/hwModules/common/laptop/amd-gpu.nix
deleted file mode 100644
index ea8f50d4..00000000
--- a/hwModules/common/laptop/amd-gpu.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{...}: {
-}
diff --git a/hwModules/framework/13/amd-7000/default.nix b/hwModules/framework/13/amd-7000/default.nix
index 09c55be4..50109a36 100644
--- a/hwModules/framework/13/amd-7000/default.nix
+++ b/hwModules/framework/13/amd-7000/default.nix
@@ -1,17 +1,17 @@
 {
   lib,
   pkgs,
+  self,
   ...
 }: {
   imports = [
-    ../../../common/bluetooth
-    ../../../common/cpu/amd
-    ../../../common/gpu/amd
-    ../../../common/laptop
-    ../../../common/laptop/amd-gpu.nix
-    ../../../common/ssd
     ../../common.nix
     ../common.nix
+    self.nixosModules.hw-common-amd-cpu
+    self.nixosModules.hw-common-amd-gpu
+    self.nixosModules.hw-common-bluetooth
+    self.nixosModules.hw-common-laptop
+    self.nixosModules.hw-common-ssd
   ];
 
   boot = {
diff --git a/hwModules/framework/13/intel-11th/default.nix b/hwModules/framework/13/intel-11th/default.nix
index 28c2c772..103ab0f3 100644
--- a/hwModules/framework/13/intel-11th/default.nix
+++ b/hwModules/framework/13/intel-11th/default.nix
@@ -1,17 +1,18 @@
 {
   lib,
   pkgs,
+  self,
   ...
 }: {
   imports = [
-    ../../../common/bluetooth
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel
-    ../../../common/laptop
-    ../../../common/laptop/intel-cpu.nix
-    ../../../common/ssd
     ../../common.nix
     ../common.nix
+    self.nixosModules.hw-common-bluetooth
+    self.nixosModules.hw-common-intel-cpu
+    self.nixosModules.hw-common-intel-gpu
+    self.nixosModules.hw-common-laptop
+    self.nixosModules.hw-common-laptop-intel-cpu
+    self.nixosModules.hw-common-ssd
   ];
 
   boot = {
diff --git a/hwModules/lenovo/yoga-9i/intel-13th/default.nix b/hwModules/lenovo/yoga-9i/intel-13th/default.nix
index caa4270c..5d2e827d 100644
--- a/hwModules/lenovo/yoga-9i/intel-13th/default.nix
+++ b/hwModules/lenovo/yoga-9i/intel-13th/default.nix
@@ -1,16 +1,17 @@
 {
   lib,
   pkgs,
+  self,
   ...
 }: {
   imports = [
-    ../../../common/bluetooth
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel
-    ../../../common/laptop
-    ../../../common/laptop/intel-cpu.nix
-    ../../../common/ssd
     ../common.nix
+    self.nixosModules.hw-common-bluetooth
+    self.nixosModules.hw-common-intel-cpu
+    self.nixosModules.hw-common-intel-gpu
+    self.nixosModules.hw-common-laptop
+    self.nixosModules.hw-common-laptop-intel-cpu
+    self.nixosModules.hw-common-ssd
   ];
 
   boot = {
diff --git a/hwModules/thinkpad/t440p/default.nix b/hwModules/thinkpad/t440p/default.nix
index 7858b514..e23dbdea 100644
--- a/hwModules/thinkpad/t440p/default.nix
+++ b/hwModules/thinkpad/t440p/default.nix
@@ -1,12 +1,12 @@
-{...}: {
+{self, ...}: {
   imports = [
-    ../../common/bluetooth
-    ../../common/cpu/intel
-    ../../common/gpu/intel
-    ../../common/laptop
-    ../../common/laptop/intel-cpu.nix
-    ../../common/ssd
     ../common.nix
+    self.nixosModules.hw-common-bluetooth
+    self.nixosModules.hw-common-intel-cpu
+    self.nixosModules.hw-common-intel-gpu
+    self.nixosModules.hw-common-laptop
+    self.nixosModules.hw-common-laptop-intel-cpu
+    self.nixosModules.hw-common-ssd
   ];
 
   boot = {
@@ -27,6 +27,5 @@
   };
 
   powerManagement.cpuFreqGovernor = "ondemand";
-
   services.fwupd.enable = true;
 }