diff --git a/lib/hardware/surface.nix b/lib/hardware/surface.nix
new file mode 100644
index 0000000..da527ad
--- /dev/null
+++ b/lib/hardware/surface.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  config = {
+    services = {
+      auto-cpufreq.enable = true;
+      thermald.enable = true;
+    };
+  };
+}
diff --git a/lib/machines/manu-surface.nix b/lib/machines/manu-surface.nix
new file mode 100644
index 0000000..df1a641
--- /dev/null
+++ b/lib/machines/manu-surface.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  imports = [
+    ../hardware/surface.nix
+  ];
+}