diff --git a/lenovo/thinkpad/p14s/amd/gen2/default.nix b/lenovo/thinkpad/p14s/amd/gen2/default.nix
index ee3d52a..062ad8f 100644
--- a/lenovo/thinkpad/p14s/amd/gen2/default.nix
+++ b/lenovo/thinkpad/p14s/amd/gen2/default.nix
@@ -13,9 +13,8 @@
   boot.kernelParams = ["amdgpu.backlight=0" "acpi_backlight=none"];
 
   # Wifi support
-  boot.extraModulePackages = [ config.boot.kernelPackages.rtw89 ];
   hardware.firmware = [ pkgs.rtw89-firmware ];
 
   # For support of newer AMD GPUs, backlight and internal microphone
   boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.13") pkgs.linuxPackages_latest;
-}
\ No newline at end of file
+}
diff --git a/tests/build-profile.nix b/tests/build-profile.nix
index c4509d3..0d477b2 100644
--- a/tests/build-profile.nix
+++ b/tests/build-profile.nix
@@ -1,8 +1,8 @@
 { profile }:
 
 let
-  shim = {
-    boot.loader.systemd-boot.enable = true;
+  shim = { config, ... }: {
+    boot.loader.systemd-boot.enable = !config.boot.loader.generic-extlinux-compatible.enable && !config.boot.loader.raspberryPi.enable;
 
     fileSystems."/" = {
       device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";