diff --git a/host/modules/thinkpad.nix b/host/modules/thinkpad.nix
index f39ba52..98b5912 100644
--- a/host/modules/thinkpad.nix
+++ b/host/modules/thinkpad.nix
@@ -43,10 +43,10 @@
     # leaving this enabled is harmless; login can still use a password.
     fprintd.enable = true;
 
-    logind = {
-      lidSwitch = "suspend";
-      lidSwitchExternalPower = "suspend";
-      powerKey = "poweroff";
+    logind.settings.Login = {
+      HandleLidSwitch = "suspend";
+      HandleLidSwitchExternalPower = "suspend";
+      HandlePowerKey = "poweroff";
     };
 
     tlp.settings = {
diff --git a/modules/host/laptop.nix b/modules/host/laptop.nix
index a238b66..e1d420c 100644
--- a/modules/host/laptop.nix
+++ b/modules/host/laptop.nix
@@ -4,11 +4,11 @@ lib.mkIf config.host.laptop {
   services.tlp = {
     enable = true;
     settings = {
-      CPU_SCALING_GOVERNOR_ON_AC = "performance";
+      CPU_SCALING_GOVERNOR_ON_AC = "powersave";
       CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
 
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-      CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+      CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
 
       CPU_MIN_PERF_ON_AC = 0;
       CPU_MAX_PERF_ON_AC = 100;