diff --git a/flake.lock b/flake.lock
index 78ead8ba..a29561b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -479,11 +479,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720302727,
-        "narHash": "sha256-yVm+9LDzFpZNJIS0fuvm4Xjhn4o0gQjTlxWz+NZs4bQ=",
+        "lastModified": 1720303103,
+        "narHash": "sha256-gKShXeXvBkmVBk7gSmOe4dpQTfnPqUxq0NpJflOS89o=",
         "owner": "alyraffauf",
         "repo": "nixhw",
-        "rev": "a63a1fa3443b8ba62a0db5bd2830717ac09d182e",
+        "rev": "3c03f237fbd6d43c536bc0303986023cd06e9405",
         "type": "github"
       },
       "original": {
diff --git a/hosts/mandarin/hardware.nix b/hosts/mandarin/hardware.nix
index f1748ed3..ad4ae339 100644
--- a/hosts/mandarin/hardware.nix
+++ b/hosts/mandarin/hardware.nix
@@ -5,6 +5,13 @@
   pkgs,
   ...
 }: {
+  imports = [
+    inputs.nixhw.nixosModules.common-amd-cpu
+    inputs.nixhw.nixosModules.common-amd-gpu
+    inputs.nixhw.nixosModules.common-bluetooth
+    inputs.nixhw.nixosModules.common-ssd
+  ];
+
   boot = {
     initrd.availableKernelModules = ["nvme" "sd_mod" "usb_storage" "usbhid" "xhci_pci"];
 
@@ -12,13 +19,4 @@
   };
 
   hardware.enableAllFirmware = true;
-
-  ar.hardware = {
-    enable = true;
-    cpu.amd = true;
-    gpu.amd = true;
-    laptop = false;
-    ssd = true;
-    sound = true;
-  };
 }
diff --git a/hosts/mauville/hardware.nix b/hosts/mauville/hardware.nix
index 8beb1c8d..199bf566 100644
--- a/hosts/mauville/hardware.nix
+++ b/hosts/mauville/hardware.nix
@@ -5,16 +5,14 @@
   pkgs,
   ...
 }: {
+  imports = [
+    inputs.nixhw.nixosModules.common-amd-cpu
+    inputs.nixhw.nixosModules.common-amd-gpu
+    inputs.nixhw.nixosModules.common-bluetooth
+    inputs.nixhw.nixosModules.common-ssd
+  ];
+
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
 
   hardware.enableAllFirmware = true;
-
-  ar.hardware = {
-    enable = true;
-    cpu.amd = true;
-    gpu.amd = true;
-    laptop = false;
-    ssd = true;
-    sound = true;
-  };
 }
diff --git a/nixosModules/base/default.nix b/nixosModules/base/default.nix
index be6baeed..e910645f 100644
--- a/nixosModules/base/default.nix
+++ b/nixosModules/base/default.nix
@@ -36,6 +36,8 @@
       };
     };
 
+    hardware.keyboard.qmk.enable = true;
+
     programs.gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
@@ -46,14 +48,14 @@
       rtkit.enable = true;
     };
 
-    hardware.keyboard.qmk.enable = true;
-
     services.logind.extraConfig = ''
       # Don't shutdown when power button is short-pressed
       HandlePowerKey=suspend
       HandlePowerKeyLongPress=poweroff
     '';
 
+    sound.enable = true;
+
     system.autoUpgrade = {
       allowReboot = true;
       dates = "04:00";