diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix
index 0372ae8..6dfafef 100644
--- a/hosts/Dimaga/default.nix
+++ b/hosts/Dimaga/default.nix
@@ -42,25 +42,6 @@ in
   #   To see all available timezones, run `timedatectl list-timezones`.
   time.timeZone = "America/New_York";
 
-  # Disable suspend
-  systemd.targets = {
-    sleep.enable = false;
-    suspend.enable = false;
-    hibernate.enable = false;
-    hybrid-sleep.enable = false;
-  };
-  services = {
-    xserver.displayManager.gdm.autoSuspend = lib.mkIf config.aux.system.ui.desktops.gnome.enable false;
-    logind = {
-      lidSwitch = "lock";
-      lidSwitchDocked = "lock";
-    };
-  };
-  services.upower.ignoreLid = true;
-
-  # Enable support for building ARM64 packages
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
   # Build Nix packages for other hosts.
   # Runs every day at 4 AM
   systemd.services."build-hosts" = {
diff --git a/hosts/Dimaga/hardware-configuration.nix b/hosts/Dimaga/hardware-configuration.nix
index 4c72918..f3029df 100644
--- a/hosts/Dimaga/hardware-configuration.nix
+++ b/hosts/Dimaga/hardware-configuration.nix
@@ -36,6 +36,9 @@ in
         MAILADDR ${config.secrets.users.aires.email}
       '';
     };
+
+    # Enable support for building ARM64 packages
+    binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
 
   # Configure the main filesystem.
@@ -70,6 +73,23 @@ in
     };
   };
 
+  # Disable suspend
+  systemd.targets = {
+    sleep.enable = false;
+    suspend.enable = false;
+    hibernate.enable = false;
+    hybrid-sleep.enable = false;
+  };
+  services = {
+    xserver.displayManager.gdm.autoSuspend = lib.mkIf config.aux.system.ui.desktops.gnome.enable false;
+    logind = {
+      lidSwitch = "lock";
+      lidSwitchDocked = "lock";
+    };
+  };
+  services.upower.ignoreLid = true;
+
+  # Enable CPU microde updates
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   # Detect keyboard as "internal" so we can automatically disable the touchpad while typing
diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix
index c4ed372..8871d75 100644
--- a/hosts/Khanda/default.nix
+++ b/hosts/Khanda/default.nix
@@ -89,7 +89,4 @@ in
 
   # Build remotely
   nix.distributedBuilds = true;
-
-  # Limit the number of cores Nix can use
-  nix.settings.cores = 8;
 }
diff --git a/hosts/Khanda/hardware-configuration.nix b/hosts/Khanda/hardware-configuration.nix
index d396a7b..6e71255 100644
--- a/hosts/Khanda/hardware-configuration.nix
+++ b/hosts/Khanda/hardware-configuration.nix
@@ -14,6 +14,9 @@ in
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
+    # NOTE: Uncomment to use a default kernel and skip full kernel rebuilds
+    #kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
+
     # Enable antenna aggregation
     extraModprobeConfig = ''
       options iwlwifi 11n_disable=8
@@ -108,9 +111,9 @@ in
     "intel-ipu6-isys"
   ];
 
+  # Limit the number of cores Nix can use
+  nix.settings.cores = 8;
+
   # Install/configure additional drivers, particularly for touch
   environment.systemPackages = with pkgs; [ libwacom-surface ];
-
-  # NOTE: Uncomment to use a default kernel and skip full kernel rebuilds
-  # boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
 }