diff --git a/desktop/sddm.nix b/desktop/sddm.nix
index 0fd6401..8799f61 100644
--- a/desktop/sddm.nix
+++ b/desktop/sddm.nix
@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.aviallon.desktop;
-  sddmCfg = config.services.displayManager.sddm;
+  sddmCfg = config.services.xserver.displayManager.sddm;
 in {
   options.aviallon.desktop.sddm.unstable = mkEnableOption "bleeding-edge SDDM";
   options.aviallon.desktop.sddm.enable = mkEnableOption "custom SDDM configuration";
@@ -11,7 +11,7 @@ in {
 
     # Prevents blinking cursor
     services.displayManager.sddm = {
-      enable = mkOverride 20 true;
+      enable = true;
       wayland.enable = mkDefault true;
       wayland.compositor = "kwin";
       settings = {
diff --git a/hardware/mesa.nix b/hardware/mesa.nix
index a2cba06..4587727 100644
--- a/hardware/mesa.nix
+++ b/hardware/mesa.nix
@@ -72,8 +72,8 @@ in {
     };
 
     hardware.graphics = {
-      package = with pkgs; cfg.internal.package;
-      package32 = with pkgs; cfg.internal.package32;
+      package = with pkgs; cfg.internal.package.drivers;
+      package32 = with pkgs; cfg.internal.package32.drivers;
 
       extraPackages = optional (hasAttr "opencl" cfg.internal.package.out) cfg.internal.package.out.opencl;
       extraPackages32 = optional (hasAttr "opencl" cfg.internal.package32.out) cfg.internal.package32.out.opencl;