diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml
index 0770d0c..c10cdcd 100644
--- a/org.srb2.SRB2.yaml
+++ b/org.srb2.SRB2.yaml
@@ -11,21 +11,8 @@ finish-args:
   - --device=all
   - --persist=.srb2
 modules:
-  - name: game-music-emu
-    buildsystem: cmake-ninja
-    cleanup:
-      - /include
-      - /lib/*.so
-      - /lib/pkgconfig
-    sources:
-      - type: archive
-        url: https://github.com/libgme/game-music-emu/archive/refs/tags/0.6.3.tar.gz
-        sha256: 4c5a7614acaea44e5cb1423817d2889deb82674ddbc4e3e1291614304b86fca0
-        x-checker-data:
-          type: anitya
-          project-id: 866
-          stable-only: true
-          url-template: https://github.com/libgme/game-music-emu/archive/refs/tags/$version.tar.gz
+  - shared-modules/linux-audio/fluidsynth2.json
+  - shared-modules/gzdoom/game-music-emu.json
 
   - name: libopenmpt
     config-opts:
@@ -51,6 +38,21 @@ modules:
           stable-only: true
           url-template: https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$version+release.autotools.tar.gz
 
+  - name: sdl-mixer-x
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DSDL_MIXER_X_SHARED=ON
+    sources:
+      - type: git
+        url: https://github.com/WohlSoft/SDL-Mixer-X
+        tag: 2.6.0
+        commit: 7181c771aa29deaea8bfbe6098613c3a929e9189
+        x-checker-data:
+          type: git
+          tag-pattern: ^([\d.]+)$
+
   - name: miniupnpc
     buildsystem: cmake-ninja
     config-opts:
@@ -70,16 +72,15 @@ modules:
   - name: srb2
     buildsystem: simple
     build-options:
-      arch:
-        aarch64:
-          env:
-            ARCH_MAKE_ARGS: LINUX64=1
-        x86_64:
-          env:
-            ARCH_MAKE_ARGS: LINUX64=1 X86_64=1
+       env:
+            libgme_ARGS: -DSRB2_CONFIG_USE_GME=ON -Dlibgme_INCLUDE_DIR=/app/include/gme -Dlibgme_LIBRARY=/app/lib/libgme.so
+            libopenmpt_ARGS: -Dlibopenmpt_INCLUDE_DIR=/app/include/libopenmpt -Dlibopenmpt_LIBRARY=/app/lib/libopenmpt.so
+            miniupnp_ARGS: -Dlibminiupnpc_INCLUDE_DIR=/app/include/miniupnpc -Dlibminiupnpc_LIBRARY=/app/lib/libminiupnpc.so
+            EXE_NAME_ARGS: -DSRB2_SDL2_EXE_NAME=lsdl2srb2
     build-commands:
-      - make -C src -j $FLATPAK_BUILDER_N_JOBS $ARCH_MAKE_ARGS
-      - install -D -m 755 -t $FLATPAK_DEST/bin bin/lsdl2srb2
+      - cmake -B build.cmake $libgme_ARGS $libopenmpt_ARGS $miniupnp_ARGS $EXE_NAME_ARGS -G "Unix Makefiles"
+      - make --directory=build.cmake --keep-going -j $FLATPAK_BUILDER_N_JOBS
+      - install -D -m 755 -t $FLATPAK_DEST/bin build.cmake/bin/lsdl2srb2
       - install -D -m 644 srb2.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/$FLATPAK_ID.png
       - install -D -m 755 srb2.sh $FLATPAK_DEST/bin/srb2
       - install -D -m 644 -t $FLATPAK_DEST/share/applications $FLATPAK_ID.desktop
diff --git a/shared-modules b/shared-modules
index e2881a1..802d804 160000
--- a/shared-modules
+++ b/shared-modules
@@ -1 +1 @@
-Subproject commit e2881a1f3a328c13ebeb7c68b7e2bab379f711d5
+Subproject commit 802d80416180436ff9929ce2a2e098203ace078e