diff --git a/server/core/build.gradle.kts b/server/core/build.gradle.kts
index a32f10154..2de63f871 100644
--- a/server/core/build.gradle.kts
+++ b/server/core/build.gradle.kts
@@ -57,19 +57,12 @@ allprojects {
 	}
 }
 
-sourceSets {
-	create("flatbuffersJava") {
-		java.srcDir("../../solarxr-protocol/lib/flatbuffers/java/src/main/java")
-	}
-}
-
 dependencies {
-	implementation(project(":solarxr-protocol"))
+	api(project(":solarxr-protocol"))
 
 	// This dependency is used internally,
 	// and not exposed to consumers on their own compile classpath.
 	// implementation("com.google.flatbuffers:flatbuffers-java:25.12.19")
-	implementation(sourceSets.getByName("flatbuffersJava").output)
 
 	implementation("commons-cli:commons-cli:1.8.0")
 	implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1")
diff --git a/solarxr-protocol b/solarxr-protocol
index d1e2f6f0f..41e291009 160000
--- a/solarxr-protocol
+++ b/solarxr-protocol
@@ -1 +1 @@
-Subproject commit d1e2f6f0f3f471b8792e1b9ce95af11c6c6e324e
+Subproject commit 41e291009c25d702eee55e66a07f580d031abf98