diff --git a/nixos/hosts/durincore/default.nix b/nixos/hosts/durincore/default.nix
index 4c32474..7321752 100644
--- a/nixos/hosts/durincore/default.nix
+++ b/nixos/hosts/durincore/default.nix
@@ -1,10 +1,16 @@
 { ... }: {
   config = {
-
-    # hardware-configuration.nix - half of the hardware-configuration.nix file
-
     networking.hostId = "ad4380db";
     networking.hostName = "durincore";
+    # Kernel mods
+    boot = {
+      initrd = {
+        availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+        kernelModules = [ ];
+      };
+      kernelModules = [ "kvm-intel" ];
+      extraModulePackages = [ ];
+    };
 
     fileSystems."/" =
       { device = "rpool/root";
diff --git a/nixos/hosts/legiondary/default.nix b/nixos/hosts/legiondary/default.nix
index 5a59ac0..5c65131 100644
--- a/nixos/hosts/legiondary/default.nix
+++ b/nixos/hosts/legiondary/default.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
@@ -10,10 +10,12 @@
 
   networking.hostId = "2132e3bf";
   networking.hostName = "legiondary";
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" =
     { device = "zpool/root";
@@ -45,6 +47,7 @@
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
+  # System settings and services.
   mySystem = {
     system.motd.networkInterfaces = [ "eno1" "wlp4s0" ];
   };
diff --git a/nixos/profiles/hw-thinkpad-t470.nix b/nixos/profiles/hw-thinkpad-t470.nix
index 30f0001..36134ba 100644
--- a/nixos/profiles/hw-thinkpad-t470.nix
+++ b/nixos/profiles/hw-thinkpad-t470.nix
@@ -10,13 +10,6 @@
         canTouchEfiVariables = true;
       };
     };
-    # Kernel mods
-    initrd = {
-      availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-      kernelModules = [ ];
-    };
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
   };
 
   networking = {