diff --git a/compiler/ast2nif.nim b/compiler/ast2nif.nim
index 157159f321..1382625cf5 100644
--- a/compiler/ast2nif.nim
+++ b/compiler/ast2nif.nim
@@ -56,12 +56,12 @@ proc toConverterIndexEntry*(config: ConfigRef; converterSym: PSym): (nifstreams.
   # Fallback: return empty entry
   result = (nifstreams.SymId(0), nifstreams.SymId(0))
 
-proc toMethodIndexEntry*(config: ConfigRef; methodSym: PSym; signature: string): MethodIndexEntry =
-  ## Converts a method symbol to a MethodIndexEntry.
+proc toMethodIndexEntry*(config: ConfigRef; methodSym: PSym; signature: string): (nifstreams.SymId, nifstreams.StrId) =
+  ## Converts a method symbol/signature to a method index entry.
   let methodSymName = methodSym.name.s & "." & $methodSym.disamb & "." & cachedModuleSuffix(config, methodSym.itemId.module.FileIndex)
-  result = MethodIndexEntry(
-    fn: pool.syms.getOrIncl(methodSymName),
-    signature: pool.strings.getOrIncl(signature)
+  result = (
+    pool.syms.getOrIncl(methodSymName),
+    pool.strings.getOrIncl(signature)
   )
 
 proc toClassSymId*(config: ConfigRef; typeId: ItemId): nifstreams.SymId =
diff --git a/koch.nim b/koch.nim
index 77cfd76950..bd3ac7e283 100644
--- a/koch.nim
+++ b/koch.nim
@@ -16,7 +16,7 @@ const
   ChecksumsStableCommit = "0b8e46379c5bc1bf73d8b3011908389c60fb9b98" # 2.0.1
   SatStableCommit = "e63eaea8baf00bed8bcd5a29ffd8823abb265b39"
 
-  NimonyStableCommit = "deb9b50c573fb55e071825ab55385e293b7216d5" # unversioned \
+  NimonyStableCommit = "ea20829a61fc770f858ea2afa59c5c5e7edbae70" # unversioned \
     # Note that Nimony uses Nim as a git submodule but we don't want to install
     # Nimony's dependency to Nim as we are Nim. So a `git clone` without --recursive
     # is **required** here.