diff --git a/web/backend/src/MediaPlayer.ts b/web/backend/src/MediaPlayer.ts
index 3dd28d8..ec5cf1f 100644
--- a/web/backend/src/MediaPlayer.ts
+++ b/web/backend/src/MediaPlayer.ts
@@ -121,10 +121,9 @@ export class MediaPlayer {
         const socketFilename = Math.random().toString(36).substring(2, 10);
         const socketPath = `/tmp/mpv-${socketFilename}`;
         const enableVideo = process.env.ENABLE_VIDEO || false;
+        const ytdlFormat = process.env.MPV_YTDL_FORMAT;
         const logfilePath = `/tmp/mpv-logfile.txt`;
-
-        console.log("Starting player process (video: " + (enableVideo ? "enabled" : "disabled") + ")");
-        this.playerProcess = spawn("mpv", [
+        const playerArgs = [
             "--video=" + (enableVideo ? "auto" : "no"),
             "--fullscreen",
             "--no-terminal",
@@ -132,7 +131,14 @@ export class MediaPlayer {
             "--input-ipc-server=" + socketPath,
             "--log-file=" + logfilePath,
             "--msg-level=all=v"
-        ]);
+        ];
+
+        if (ytdlFormat) {
+            playerArgs.push("--ytdl-format=" + ytdlFormat);
+        }
+
+        console.log("Starting player process (video: " + (enableVideo ? "enabled" : "disabled") + ")");
+        this.playerProcess = spawn("mpv", playerArgs);
 
         
         let socketReady!: (s: Socket) => void;
diff --git a/web/flake.nix b/web/flake.nix
index 7f81fac..a53dcba 100644
--- a/web/flake.nix
+++ b/web/flake.nix
@@ -8,10 +8,76 @@
 
   outputs = { self, nixpkgs, flake-utils }:
     let
+      mkQueuecube = pkgs: pkgs.buildNpmPackage {
+        pname = "queuecube";
+        version = "0.1.0";
+        
+        src = ./.;
+
+        # Skip the standard buildPhase and provide our own
+        dontNpmBuild = true;
+        buildPhase = ''
+          # First install all dependencies
+          npm install
+          
+          # Then run the build with workspaces flag
+          npm run build --workspaces
+        '';
+
+        # Runtime dependencies
+        buildInputs = with pkgs; [
+          mpv
+          yt-dlp
+          pulseaudio
+        ];
+        
+        # Create a wrapper script to ensure runtime deps are available
+        postInstall = ''
+          # Create the necessary directories
+          mkdir -p $out/lib/node_modules/queuecube
+          
+          # Copy the entire project with built files
+          cp -r . $out/lib/node_modules/queuecube
+
+          # Install the frontend build to the backend dist directory
+          mkdir -p $out/lib/node_modules/queuecube/backend/dist/
+          cp -r frontend/dist $out/lib/node_modules/queuecube/backend/dist/frontend
+
+          # Create bin directory if it doesn't exist
+          mkdir -p $out/bin
+          
+          # Create executable script
+          cat > $out/bin/queuecube <<EOF
+          #!/bin/sh
+          exec ${pkgs.nodejs}/bin/node $out/lib/node_modules/queuecube/backend/build/server.js
+          EOF
+          
+          # Make it executable
+          chmod +x $out/bin/queuecube
+          
+          # Wrap the program to include runtime deps in PATH
+          wrapProgram $out/bin/queuecube \
+            --prefix PATH : ${pkgs.lib.makeBinPath [
+              pkgs.mpv
+              pkgs.yt-dlp
+              pkgs.pulseaudio
+            ]}
+        '';
+        
+        # Let buildNpmPackage handle npm package hash
+        npmDepsHash = "sha256-kwbWqNqji0EcBeRuc/sqQUuGQkE+P8puLTfpAyRRzgY=";
+        
+        meta = with pkgs.lib; {
+          description = "NodeJS application with media playback capabilities";
+          platforms = platforms.linux;
+        };
+      };
+
       # Define the NixOS module for the systemd service
       nixosModule = { config, lib, pkgs, ... }:
         let
           cfg = config.services.queuecube;
+          package = mkQueuecube pkgs;
         in {
           options.services.queuecube = {
             enable = lib.mkEnableOption "QueueCube media player service";
@@ -34,6 +100,12 @@
               description = "Enable screensharing";
             };
 
+            mpv_ytdl_format = lib.mkOption {
+              type = lib.types.nullOr lib.types.str;
+              default = "best";
+              description = "yt-dlp format selector passed to mpv. Set to null to use mpv's default format selection.";
+            };
+
             store_path = lib.mkOption {
               type = lib.types.str;
               default = "/var/tmp/queuecube";
@@ -71,7 +143,7 @@
           
           config = lib.mkIf cfg.enable {
             users.users.${cfg.user} = {
-              packages = [ self.packages.${pkgs.system}.queuecube ];
+              packages = [ package ];
             };
             
             systemd.user.services.queuecube = {
@@ -80,7 +152,7 @@
               after = [ "pipewire.service" "pipewire-pulse.service" ];
 
               serviceConfig = {
-                ExecStart = "${self.packages.${pkgs.system}.queuecube}/bin/queuecube";
+                ExecStart = "${package}/bin/queuecube";
                 Restart = "on-failure";
                 RestartSec = 5;
 
@@ -119,6 +191,8 @@
                 USE_INVIDIOUS = if cfg.invidious.enable then "1" else "0";
                 INVIDIOUS_BASE_URL = cfg.invidious.url;
                 STORE_PATH = cfg.store_path;
+              } // lib.optionalAttrs (cfg.mpv_ytdl_format != null) {
+                MPV_YTDL_FORMAT = cfg.mpv_ytdl_format;
               };
             };
           };
@@ -127,72 +201,7 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        
-        # Define the package using buildNpmPackage
-        queuecube = pkgs.buildNpmPackage {
-          pname = "queuecube";
-          version = "0.1.0";
-          
-          src = ./.;
-
-          # Skip the standard buildPhase and provide our own
-          dontNpmBuild = true;
-          buildPhase = ''
-            # First install all dependencies
-            npm install
-            
-            # Then run the build with workspaces flag
-            npm run build --workspaces
-          '';
-
-          # Runtime dependencies
-          buildInputs = with pkgs; [
-            mpv
-            yt-dlp
-            pulseaudio
-          ];
-          
-          # Create a wrapper script to ensure runtime deps are available
-          postInstall = ''
-            # Create the necessary directories
-            mkdir -p $out/lib/node_modules/queuecube
-            
-            # Copy the entire project with built files
-            cp -r . $out/lib/node_modules/queuecube
-
-            # Install the frontend build to the backend dist directory
-            mkdir -p $out/lib/node_modules/queuecube/backend/dist/
-            cp -r frontend/dist $out/lib/node_modules/queuecube/backend/dist/frontend
-
-            # Create bin directory if it doesn't exist
-            mkdir -p $out/bin
-            
-            # Create executable script
-            cat > $out/bin/queuecube <<EOF
-            #!/bin/sh
-            exec ${pkgs.nodejs}/bin/node $out/lib/node_modules/queuecube/backend/build/server.js
-            EOF
-            
-            # Make it executable
-            chmod +x $out/bin/queuecube
-            
-            # Wrap the program to include runtime deps in PATH
-            wrapProgram $out/bin/queuecube \
-              --prefix PATH : ${pkgs.lib.makeBinPath [
-                pkgs.mpv
-                pkgs.yt-dlp
-                pkgs.pulseaudio
-              ]}
-          '';
-          
-          # Let buildNpmPackage handle npm package hash
-          npmDepsHash = "sha256-kwbWqNqji0EcBeRuc/sqQUuGQkE+P8puLTfpAyRRzgY=";
-          
-          meta = with pkgs.lib; {
-            description = "NodeJS application with media playback capabilities";
-            platforms = platforms.linux;
-          };
-        };
+        queuecube = mkQueuecube pkgs;
         
       in {
         packages = {
@@ -208,8 +217,7 @@
         # Development environment
         devShells.default = pkgs.mkShell {
           buildInputs = with pkgs; [
-            nodejs_20
-            nodePackages.npm
+            nodejs
             mpv
             yt-dlp
             pulseaudio