diff --git a/hosts/Gutterman/default.nix b/hosts/Gutterman/default.nix
index bf62b64..fe5ed63 100644
--- a/hosts/Gutterman/default.nix
+++ b/hosts/Gutterman/default.nix
@@ -1,8 +1,8 @@
-{ inputs, config, modulesPath, lib, pkgs, ... }:
+{ inputs, config, pkgs, ... }:
 
 {
   imports = [
-    (modulesPath + "/virtualisation/proxmox-lxc.nix")
+    ./hardware-configuration.nix
 
     ../../modules/common
 
@@ -15,29 +15,14 @@
     ../../modules/nixos/services/restic.nix
     ../../modules/nixos/services/sops.nix
 
-    ../../modules/nixos/system/headless.nix
+    ../../modules/nixos/system/laptop/auto-cpufreq.nix
     ../../modules/nixos/system/minimal.nix
   ];
 
-  proxmoxLXC.manageHostName = true;
-
-  # enabled by default in the proxmox-lxc module in nixpkgs
-  services.openssh.enable = false;
-
-  boot.loader.systemd-boot.enable = lib.mkForce false;
-
-  services.fstrim.enable = false;
-
-  services.resolved.extraConfig = ''
-    Cache=true
-    CacheFromLocalhost=true
-  '';
-
   environment.systemPackages = [
     pkgs.btop
     pkgs.steamcmd
   ];
 
-  nixpkgs.hostPlatform = "x86_64-linux";
-  system.stateVersion = "25.05";
+  system.stateVersion = "25.11";
 }
diff --git a/hosts/Gutterman/hardware-configuration.nix b/hosts/Gutterman/hardware-configuration.nix
new file mode 100644
index 0000000..fdd97c1
--- /dev/null
+++ b/hosts/Gutterman/hardware-configuration.nix
@@ -0,0 +1,72 @@
+# 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, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/2ee5f08e-05f1-4ac8-bb6d-8946da15937b";
+      fsType = "btrfs";
+      options = [
+        "subvol=root"
+        "compress=zstd"
+      ];
+    };
+
+  fileSystems."/var/lib" =
+    { device = "/dev/disk/by-uuid/2ee5f08e-05f1-4ac8-bb6d-8946da15937b";
+      fsType = "btrfs";
+      options = [
+        "subvol=var/lib"
+        "compress=zstd"
+      ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/2ee5f08e-05f1-4ac8-bb6d-8946da15937b";
+      fsType = "btrfs";
+      options = [
+        "subvol=nix"
+        "compress=zstd"
+        "noatime"
+      ];
+    };
+
+  fileSystems."/swap" =
+    { device = "/dev/disk/by-uuid/2ee5f08e-05f1-4ac8-bb6d-8946da15937b";
+      fsType = "btrfs";
+      options = [
+        "subvol=swap"
+        "noatime"
+      ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/2877-1C39";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [{
+    device = "/swap/swapfile";
+    size = 8*1024;
+  }];
+
+  hardware.enableRedistributableFirmware = true;
+  services = {
+    thermald.enable = true;
+    fwupd.enable = true;
+  };
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}