diff --git a/flake.lock b/flake.lock
index ca991bfee6c..0bc2e951893 100644
--- a/flake.lock
+++ b/flake.lock
@@ -190,15 +190,15 @@
         "utils": "utils_3"
       },
       "locked": {
-        "lastModified": 1689018333,
-        "narHash": "sha256-sthxx50rj0E7gv38oeMj8GZOp7i1776P1qZsM7pVLd0=",
-        "owner": "goodlyrottenapple",
+        "lastModified": 1643802645,
+        "narHash": "sha256-BynM25iwp/l3FyrcHqiNJdDxvN6IxSM3/zkFR6PD3B0=",
+        "owner": "nix-community",
         "repo": "mavenix",
-        "rev": "153d69e62f87e5dd37d35492cc3e35dd80d2b5fa",
+        "rev": "ce9ddfd7f361190e8e8dcfaf6b8282eebbb3c7cb",
         "type": "github"
       },
       "original": {
-        "owner": "goodlyrottenapple",
+        "owner": "nix-community",
         "repo": "mavenix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 661d2930d84..0d96018b5cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
     llvm-backend.inputs.nixpkgs.follows = "haskell-backend/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
     rv-utils.url = "github:runtimeverification/rv-nix-tools";
-    mavenix.url = "github:goodlyrottenapple/mavenix";
+    mavenix.url = "github:nix-community/mavenix";
     # needed by nix/flake-compat-k-unwrapped.nix
     flake-compat = {
       url = "github:edolstra/flake-compat";
diff --git a/nix/k.nix b/nix/k.nix
index 7b9a08673b9..37b35ede091 100644
--- a/nix/k.nix
+++ b/nix/k.nix
@@ -9,11 +9,6 @@ let
     infoFile = ./mavenix.lock;
     inherit src;
 
-    # By default, mavenix copies the jars defined in `submodules` of mavenix.lock to `$out/share/java`.
-    # The following flag disables this, since we copy the jars ourselves.
-    # Otherwise, the jars are needlessly duplicated and bloat the cachix cache.
-    copySubmodules = false;
-
     # Add build dependencies
     buildInputs = [ git ];
 
@@ -38,15 +33,6 @@ let
     postInstall = ''
       cp -r k-distribution/target/release/k/{bin,include,lib} $out/
 
-      for file in $out/lib/kframework/java/*; do
-        file_name=$(basename $file)
-        found_in_share="$(find -L $out/share/mavenix/repo -maxdepth 20 -name "$file_name")"
-        if [ ! -z "$found_in_share" ]; then
-          rm "$file"
-          ln -sf "$found_in_share" "$file"
-        fi
-      done
-
       mkdir -p $out/lib/cmake/kframework && cp ${llvm-backend.src}/cmake/* $out/lib/cmake/kframework/
       ln -sf ${llvm-backend}/include/kllvm $out/include/
       ln -sf ${llvm-backend}/include/kllvm-c $out/include/