diff --git a/dell/xps/15-9560/nvidia/default.nix b/dell/xps/15-9560/nvidia/default.nix
index 2cd5d1b..a7ba241 100644
--- a/dell/xps/15-9560/nvidia/default.nix
+++ b/dell/xps/15-9560/nvidia/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../../../../common/cpu/intel
+    ../../../../common/gpu/nvidia.nix
     ../../../../common/pc/laptop
     ../xps-common.nix
   ];
@@ -11,10 +12,11 @@
   # This runs only nvidia, great for games or heavy use of render applications
 
   ##### disable intel, run nvidia only and as default
-  services.xserver.videoDrivers = lib.mkDefault ["nvidia"];
-  hardware.nvidia.modesetting.enable = lib.mkDefault true;
-  hardware.nvidia.optimus_prime.enable = lib.mkDefault true;
-  hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkDefault "PCI:1:0:0";
-  hardware.nvidia.optimus_prime.intelBusId = lib.mkDefault "PCI:0:2:0";
+  hardware.nvidia.prime = {
+    # Bus ID of the Intel GPU.
+    intelBusId = lib.mkDefault "PCI:0:2:0";
 
+    # Bus ID of the NVIDIA GPU.
+    nvidiaBusId = lib.mkDefault "PCI:1:0:0";
+  };
 }