diff --git a/apple/t2/README.md b/apple/t2/README.md
index ba6d73ba1..89d2f8d9e 100644
--- a/apple/t2/README.md
+++ b/apple/t2/README.md
@@ -10,7 +10,7 @@ You can consult the [wiki](https://wiki.t2linux.org/) for information specific t
 
 ## Unlocking Internal iGPU
 
-The `apple-set-os-loader-installer.nix` module serves as an installer for the [`apple-set-os-loader`](https://github.com/Redecorating/apple_set_os-loader). This tool is designed to unlock the internal integrated GPU (iGPU) on certain MacBooks. See https://wiki.t2linux.org/guides/hybrid-graphics/ for more details.
+The `apple-set-os-loader-installer` module serves as an installer for the [`apple-set-os-loader`](https://github.com/Redecorating/apple_set_os-loader). This tool is designed to unlock the internal integrated GPU (iGPU) on certain MacBooks. See https://wiki.t2linux.org/guides/hybrid-graphics/ for more details.
 
 ### What it Does:
 
@@ -22,12 +22,9 @@ Upon activation, this module performs the following:
 
 ### How to Implement:
 
-1. **Integrate the apple-set-os-loader installer** into your `configuration.nix`:
+1. Add this into your `configuration.nix`:
 ```
-imports = [
-  ...
-  "${builtins.fetchGit { url = "https://github.com/NixOS/nixos-hardware.git"; }}/apple/t2/apple-set-os-loader-installer.nix"
-];
+ hardware.t2.appleSetOsLoader.enable = true;
 ```
 
 2. **Rebuild your system**:
diff --git a/apple/t2/apple-set-os-loader-installer.nix b/apple/t2/apple-set-os-loader-installer.nix
deleted file mode 100644
index 92463b4e6..000000000
--- a/apple/t2/apple-set-os-loader-installer.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, pkgs, ... }:
-let
-  apple-set-os-loader-installer = pkgs.stdenv.mkDerivation rec {
-    name = "apple-set-os-loader-installer-1.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "Redecorating";
-      repo = "apple_set_os-loader";
-      rev = "r33.9856dc4";
-      sha256 = "hvwqfoF989PfDRrwU0BMi69nFjPeOmSaD6vR6jIRK2Y=";
-    };
-    buildInputs = [ pkgs.gnu-efi ];
-    buildPhase = ''
-      substituteInPlace Makefile --replace "/usr" '$(GNU_EFI)'
-      export GNU_EFI=${pkgs.gnu-efi}
-      make
-    '';
-    installPhase = ''
-      install -D bootx64_silent.efi $out/bootx64.efi
-    '';
-  };
-in
-{
-  system.activationScripts.hybrid-graphics = {
-    text = ''
-      if [[ -e /boot/efi/EFI/BOOT/bootx64_original.efi ]]; then
-        # We interpret this as apple-set-os-loader being already installed
-        exit 0
-      elif [[ -e /boot/efi/EFI/BOOT/BOOTX64.EFI ]] then
-        mv /boot/efi/EFI/BOOT/BOOTX64.EFI  /boot/efi/EFI/BOOT/bootx64_original.efi
-        cp ${apple-set-os-loader-installer}/bootx64.efi /boot/efi/EFI/BOOT/bootx64.efi
-      else
-        echo "Error: /boot/efi/EFI/BOOT/BOOTX64.EFI is missing"
-      fi
-    '';
-  };
-  environment.etc."modprobe.d/apple-gmux.conf".text = ''
-    # Enable the iGPU by default if present
-    options apple-gmux force_igd=y
-  '';
-  environment.systemPackages = with pkgs; [ apple-set-os-loader-installer ];
-}
diff --git a/apple/t2/default.nix b/apple/t2/default.nix
index df62afc27..cff47263c 100644
--- a/apple/t2/default.nix
+++ b/apple/t2/default.nix
@@ -11,11 +11,16 @@ let
   overrideAudioFiles = package: pluginsPath:
     package.overrideAttrs (new: old: {
       preConfigurePhases = old.preConfigurePhases or [ ] ++ [ "postPatchPhase" ];
-
       postPatchPhase = ''
         cp -r ${audioFiles}/files/{profile-sets,paths} ${pluginsPath}/alsa/mixer/
       '';
     });
+
+  pipewirePackage = overrideAudioFiles pkgs.pipewire "spa/plugins/";
+
+  # Build apple-os-loader
+  appleOSLoader = pkgs.callPackage ./apple/os-loader.nix { };
+
 in
 {
   # For keyboard and touchbar
@@ -31,12 +36,9 @@ in
 
   hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
 
-  services.pipewire = rec {
-    package = overrideAudioFiles pkgs.pipewire "spa/plugins/";
-
-    wireplumber.package = pkgs.wireplumber.override {
-      pipewire = package;
-    };
+  services.pipewire.package = pipewirePackage;
+  services.pipewire.wireplumber.package = pkgs.wireplumber.override {
+    pipewire = pipewirePackage;
   };
 
   # Make sure post-resume.service exists
@@ -47,9 +49,7 @@ in
     serviceConfig.ExecStart = ''${pkgs.systemd}/bin/systemd-inhibit --what=sleep --why="fixing keyboard backlight and touchbar must finish before sleep" --mode=delay ${./fix-keyboard-backlight-and-touchbar.sh}'';
     serviceConfig.Type = "oneshot";
     description = "reload touchbar driver and restart upower";
-    # must run at boot (and not too early), and after suspend
     wantedBy = [ "display-manager.service" "post-resume.target" ];
-    # prevent running before suspend
     after = [ "post-resume.target" ];
   };
 }