diff --git a/config/hosts/aspects/doloro-laptop/host.nix b/config/hosts/aspects/doloro-laptop/host.nix
index 0e38b84..24b6e13 100644
--- a/config/hosts/aspects/doloro-laptop/host.nix
+++ b/config/hosts/aspects/doloro-laptop/host.nix
@@ -51,18 +51,6 @@
         };
 
         services.gnome.gnome-keyring.enable = true;
-        services.scx = {
-          enable = true;
-          scheduler = "scx_lavd";
-          extraArgs = [
-            "--cpu-pref-order 20-21,12-19,0-11"
-            "--autopilot"
-          ];
-        };
-        systemd.services.scx.environment = {
-          SCX_SCHEDULER_OVERRIDE = "scx_lavd";
-          SCX_FLAGS_OVERRIDE = "--autopilot --cpu-pref-order 20-21,12-19,0-11 --no-use-em";
-        };
 
         hardware = {
           # firmware = [ pkgs.intel-npu-driver ];
diff --git a/config/modules/power-management/common.nix b/config/modules/power-management/common.nix
index 5948ff7..419f07b 100644
--- a/config/modules/power-management/common.nix
+++ b/config/modules/power-management/common.nix
@@ -7,6 +7,7 @@
         modules.battery-ac-targets
         modules.intel-mgm
         modules.tlp
+        modules.lavd
         # modules.ppd
       ];
     };
diff --git a/config/modules/power-management/lavd.nix b/config/modules/power-management/lavd.nix
new file mode 100644
index 0000000..1cc1be3
--- /dev/null
+++ b/config/modules/power-management/lavd.nix
@@ -0,0 +1,20 @@
+{ modules, den, ... }:
+{
+  modules.lavd = {
+    nixos = {
+      services.scx = {
+        enable = true;
+        scheduler = "scx_lavd";
+        extraArgs = [
+          "--cpu-pref-order 20-21,12-19,0-11"
+          "--autopilot"
+        ];
+      };
+      # Most energy efficent scheduler setup..
+      systemd.services.scx.environment = {
+        SCX_SCHEDULER_OVERRIDE = "scx_lavd";
+        SCX_FLAGS_OVERRIDE = "--powersave --enable-cpu-bw";
+      };
+    };
+  };
+}