diff --git a/lenovo/legion/16ach6h/hybrid/default.nix b/lenovo/legion/16ach6h/hybrid/default.nix
index ab94e1c5f..a19d0ca69 100644
--- a/lenovo/legion/16ach6h/hybrid/default.nix
+++ b/lenovo/legion/16ach6h/hybrid/default.nix
@@ -14,6 +14,15 @@
   hardware = {
     amdgpu.loadInInitrd = lib.mkDefault false;
 
+    # Still needs to load at some point if we want X11 to work
+    boot.kernelModules = [ "amdgpu" ];
+
+    # Modesetting just doesn't work (on X11?), so get rid of it by only explicitly declaring nvidia
+    # Needed due to https://github.com/NixOS/nixos-hardware/commit/630a8e3e4eea61d35524699f2f59dbc64886357d
+    # See also https://github.com/NixOS/nixos-hardware/issues/628
+    # options.services.xserver.drivers will have a amdgpu entry from using the prime stuff in nixpkgs
+    services.xserver.videoDrivers = [ "nvidia" ];
+
     nvidia = {
       modesetting.enable = lib.mkDefault true;
       powerManagement.enable = lib.mkDefault true;
@@ -24,4 +33,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}