diff --git a/system76/gaze18/default.nix b/system76/gaze18/default.nix
index d3b0044..813d218 100644
--- a/system76/gaze18/default.nix
+++ b/system76/gaze18/default.nix
@@ -2,36 +2,23 @@
 {
   imports = [
     ../.
+    ../../common/gpu/nvidia/prime.nix
   ];
-  boot.initrd.kernelModules = [ "nvidia" ];
-
   hardware.opengl = {
     enable = lib.mkDefault true;
     driSupport = lib.mkDefault true;
     driSupport32Bit = lib.mkDefault true;
-    extraPackages = with pkgs; [
-      vaapiVdpau
-    ];
   };
 
-  services.xserver.videoDrivers = ["nvidia"];
-
   hardware.nvidia = {
 
     modesetting.enable = lib.mkDefault true;
 
     powerManagement.finegrained = lib.mkDefault true;
 
-    nvidiaSettings = lib.mkDefault true;
-
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
     prime = {
       intelBusId = "PCI:0:2:0";
       nvidiaBusId = "PCI:1:0:0";
-      offload = {
-        enable = true;
-        enableOffloadCmd = lib.mkDefault true;
-      };
     };
   };
 }