diff --git a/common/gpu/nvidia/prime.nix b/common/gpu/nvidia/prime.nix
index d2ba65b..c551389 100644
--- a/common/gpu/nvidia/prime.nix
+++ b/common/gpu/nvidia/prime.nix
@@ -1,22 +1,13 @@
 { lib, pkgs, ... }:
 
-# This creates a new 'nvidia-offload' program that runs the application passed to it on the GPU
-# As per https://nixos.wiki/wiki/Nvidia
-let
-  nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
-    export __NV_PRIME_RENDER_OFFLOAD=1
-    export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
-    export __GLX_VENDOR_LIBRARY_NAME=nvidia
-    export __VK_LAYER_NV_optimus=NVIDIA_only
-    exec "$@"
-  '';
-in {
+{
   imports = [ ./. ];
 
-  environment.systemPackages = [ nvidia-offload ];
-
   hardware.nvidia.prime = {
-    offload.enable = lib.mkOverride 990 true;
+    offload = {
+      enable = lib.mkOverride 990 true;
+      enableOffloadCmd = true; # Provides `nvidia-offload` command.
+    };
     # Hardware should specify the bus ID for intel/nvidia devices
   };
 }