diff --git a/devices/surface/default.nix b/devices/surface/default.nix
index 13ea874..8e889f9 100644
--- a/devices/surface/default.nix
+++ b/devices/surface/default.nix
@@ -4,9 +4,6 @@
     ./options.nix
   ];
 
-  # Select kernel version
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-
   networking.hostName = "surface";
 
   # Add user to surface control group for surface linux
@@ -32,18 +29,11 @@
     ];
   };
 
-  services.auto-cpufreq = {
-    enable = true;
-    settings = {
-      battery = {
-        governor = "powersaver";
-        turbo = "never";
-      };
-      charger = {
-        governor = "performance";
-        turbo = "auto";
-      };
-    };
+  services.thermald.enable = true;
+
+  microsoft-surface = {
+    ipts.enable = true;
+    surface-control.enable = true;
   };
 
   # This value determines the NixOS release from which the default
diff --git a/outputs.nix b/outputs.nix
index 5ec2aa5..d1da7a3 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -36,6 +36,7 @@
       system = "x86_64-linux";
       modules = [
         ./devices/surface
+        nixos-hardware.nixosModules.microsoft-surface-pro-intel
       ] ++ clientModules;
     };