diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix
index 99041e3..7026c33 100644
--- a/microsoft/surface/surface-go/default.nix
+++ b/microsoft/surface/surface-go/default.nix
@@ -6,10 +6,18 @@ in {
   imports = [
     ../common
     ./firmware/ath10k
+    ../../../common/pc
+    ../../../common/pc/ssd
+    ../../../common/cpu/intel
+    ../../../common/cpu/intel/kaby-lake
+  ];
+
+  boot.kernelParams = [
+    "i915.enable_rc6=1"
+    "i915.modeset=1"
   ];
 
   boot.extraModprobeConfig = mkDefault ''
-    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