diff --git a/hosts/mashu.nix b/hosts/mashu.nix
index e6ae33a..31cb8cb 100644
--- a/hosts/mashu.nix
+++ b/hosts/mashu.nix
@@ -37,9 +37,13 @@ in mkHost config {
     networking.wireless.enable = true;
     hardware.video.hidpi.enable = true;
     boot = {
+      kernelParams = [ "mem_sleep_default=deep" ];
       extraModprobeConfig = ''
-        options kvm_amd nested=1
-        options vfio-pci ids=1002:67df,1002:aaf0
+	options i915 enable_fbc=1 enable_rc6=1 modeset=1
+	options snd_hda_intel power_save=1
+	options snd_ac97_codec power_save=1
+	options iwlwifi power_save=Y
+	options iwldvm force_cam=N
       '';
       initrd = {
         availableKernelModules = [ "xhci_pci" "nvme" "usbhid" ];
diff --git a/modules/hardware/surface-pro6.nix b/modules/hardware/surface-pro6.nix
index f8e9e80..931ec29 100644
--- a/modules/hardware/surface-pro6.nix
+++ b/modules/hardware/surface-pro6.nix
@@ -110,6 +110,12 @@ in {
         SURFACE_PRO3_BUTTON m
         SURFACE_GPE m
         SURFACE_BOOK1_DGPU_SWITCH m
+
+	#
+	# Other
+	#
+	PINCTRL_INTEL y
+	PINCTRL_SUNRISEPOINT y
       '';
       }
     ];