diff --git a/modules/nixos/hardware/cpu.nix b/modules/nixos/hardware/cpu.nix
deleted file mode 100644
index 7f95f6a..0000000
--- a/modules/nixos/hardware/cpu.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-{
-  config = lib.mkMerge [
-    (lib.mkIf (config.hardware.platform == "amd") {
-      hardware.cpu.amd.updateMicrocode = true;
-      boot.kernelModules = [ "kvm-amd" ];
-    })
-    (lib.mkIf (config.hardware.platform == "intel") {
-      hardware.cpu.intel.updateMicrocode = true;
-      boot.kernelModules = [ "kvm-intel" ];
-    })
-  ];
-}
diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix
index c1370bc..c40cb08 100644
--- a/modules/nixos/hardware/default.nix
+++ b/modules/nixos/hardware/default.nix
@@ -1,10 +1,9 @@
-{ lib, ... }:
+{ lib, config, ... }:
 {
   imports = [
     ./btrfs.nix
     ./nvidia.nix
     ./audio.nix
-    ./cpu.nix
     ./networking.nix
   ];
 
@@ -18,12 +17,22 @@
     platform = lib.pantheon.mkStrOption;
   };
 
-  config = {
-    services.fwupd.enable = true;
-    hardware.bluetooth = {
-      enable = true;
-      settings.General.Experimental = true;
-    };
-    hardware.xone.enable = true;
-  };
+  config = lib.mkMerge [
+    {
+      services.fwupd.enable = true;
+      hardware.bluetooth = {
+        enable = true;
+        settings.General.Experimental = true;
+      };
+      hardware.xone.enable = true;
+    }
+    (lib.mkIf (config.hardware.platform == "amd") {
+      hardware.cpu.amd.updateMicrocode = true;
+      boot.kernelModules = [ "kvm-amd" ];
+    })
+    (lib.mkIf (config.hardware.platform == "intel") {
+      hardware.cpu.intel.updateMicrocode = true;
+      boot.kernelModules = [ "kvm-intel" ];
+    })
+  ];
 }