diff --git a/sets/laptop.nix b/sets/laptop.nix
index fe0bb99..78d9891 100644
--- a/sets/laptop.nix
+++ b/sets/laptop.nix
@@ -5,7 +5,10 @@
     ./wifi.nix
   ];
 
-  services.upower.enable = true;
+  services = {
+    tlp.enable = true;
+    upower.enable = true;
+  };
   programs.light.enable = true;
   users.users.artemis.extraGroups = [ "video" ];
 
diff --git a/system/rainbowdash/boot-config.nix b/system/rainbowdash/boot-config.nix
index 69ca673..5e0b1dd 100644
--- a/system/rainbowdash/boot-config.nix
+++ b/system/rainbowdash/boot-config.nix
@@ -3,14 +3,7 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [ "mem_sleep_default=deep" "initcall_debug" ];
-    kernelPatches = [{
-      name = "debug_acpi";
-      patch = null;
-      extraConfig = ''
-        ACPI_DEBUG y
-      '';
-    }];
+    kernelParams = [ "mem_sleep_default=deep" ];
     kernel.sysctl."vm.swappiness" = 5;
     cleanTmpDir = true;
     blacklistedKernelModules = [ "psmouse" ];
diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix
index 6fa6801..314b731 100644
--- a/system/rainbowdash/default.nix
+++ b/system/rainbowdash/default.nix
@@ -12,15 +12,11 @@
     ../../sets/1password.nix
     ../../sets/workstation.nix
     ../../sets/krb5.nix
-    inputs.nixos-hardware.nixosModules.common-cpu-intel
-    inputs.nixos-hardware.nixosModules.common-pc-laptop
-    inputs.nixos-hardware.nixosModules.common-pc-laptop-acpi_call
+    inputs.nixos-hardware.nixosModules.dell-xps-13-9380
   ];
 
   boot.supportedFilesystems = [ "nfs4" ];
 
-  services.throttled.enable = true;
-
   # Home
   home-manager.users.artemis = {
     wayland.windowManager.sway.config = {
@@ -43,6 +39,7 @@
     '';
   };
 
+  services.thermald.enable = true;
 
   networking.domain = "manehattan.artem.ist";
   networking.hostName = "rainbowdash";