diff --git a/hosts/nidaros/default.nix b/hosts/nidaros/default.nix
index 8273b6d..c7bd7ba 100644
--- a/hosts/nidaros/default.nix
+++ b/hosts/nidaros/default.nix
@@ -3,7 +3,6 @@
 {
   imports = with lib.custom; [
     (relativeToBase "modules")
-    ./configuration.nix
     ./hardware.nix
   ];
 
diff --git a/hosts/nidaros/hardware.nix b/hosts/nidaros/hardware.nix
index 8e09a16..1b011b2 100644
--- a/hosts/nidaros/hardware.nix
+++ b/hosts/nidaros/hardware.nix
@@ -17,7 +17,6 @@
     "xhci_pci"
     "ahci"
     "nvme"
-    "usb_storage"
     "usbhid"
     "sd_mod"
   ];
@@ -26,12 +25,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/cc66d953-c0b5-449d-8790-1dd113661da3";
+    device = "/dev/disk/by-uuid/27a8c7df-442b-423e-9e0a-5ed9571a81ed";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/E198-D3D4";
+    device = "/dev/disk/by-uuid/63B5-A86A";
     fsType = "vfat";
     options = [
       "fmask=0077"
@@ -39,9 +38,7 @@
     ];
   };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/9631df4c-632f-49ec-8c97-bb66012fa26a"; }
-  ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's