diff --git a/system76/gaze18/default.nix b/system76/gaze18/default.nix
index 61b3f92f9..51caa436a 100644
--- a/system76/gaze18/default.nix
+++ b/system76/gaze18/default.nix
@@ -9,9 +9,16 @@
     ../.
     ../../common/gpu/nvidia/prime.nix
     ../../common/gpu/nvidia/ampere
+    ../../common/cpu/intel/raptor-lake
+    ../../common/pc/laptop
+    ../../common/pc/ssd
   ];
 
-  boot.initrd.kernelModules = [ "nvidia" ];
+  # For offloading, `modesetting` is needed
+  services.xserver.videoDrivers = [
+    "modesetting"
+    "nvidia"
+  ];
 
   hardware.graphics = {
     enable = lib.mkDefault true;
@@ -20,8 +27,6 @@
 
   hardware.nvidia = {
 
-    # modesetting.enable = lib.mkDefault true;
-
     powerManagement.finegrained = lib.mkDefault true;
 
     prime = {