diff --git a/src/Makefile b/src/Makefile
index bd04d2c410e..75f31108159 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -502,7 +502,7 @@ endif
 # In earlier NDK versions, you'll need to pass -fno-addrsig if using GNU binutils.
 # Currently we don't know how to make PGO builds with the NDK yet.
 ifeq ($(COMP),ndk)
-	CXXFLAGS += -stdlib=libc++ -fPIE -mcmodel=large
+	CXXFLAGS += -stdlib=libc++ -fPIE
 	comp=clang
 	ifeq ($(arch),armv7)
 		CXX=armv7a-linux-androideabi16-clang++
diff --git a/src/nnue/network.cpp b/src/nnue/network.cpp
index 5d4e0954d78..bea3e7cb398 100644
--- a/src/nnue/network.cpp
+++ b/src/nnue/network.cpp
@@ -55,15 +55,33 @@ const unsigned char        gEmbeddedNNUESmallData[1] = {0x0};
 const unsigned char* const gEmbeddedNNUESmallEnd     = &gEmbeddedNNUESmallData[1];
 const unsigned int         gEmbeddedNNUESmallSize    = 1;
 #endif
+
+struct EmbeddedNNUE {
+    EmbeddedNNUE(const unsigned char* embeddedData,
+                 const unsigned char* embeddedEnd,
+                 const unsigned int   embeddedSize) :
+        data(embeddedData),
+        end(embeddedEnd),
+        size(embeddedSize) {}
+    const unsigned char* data;
+    const unsigned char* end;
+    const unsigned int   size;
+};
+
+using namespace Stockfish::Eval::NNUE;
+
+EmbeddedNNUE get_embedded(EmbeddedNNUEType type) {
+    if (type == EmbeddedNNUEType::BIG)
+        return EmbeddedNNUE(gEmbeddedNNUEBigData, gEmbeddedNNUEBigEnd, gEmbeddedNNUEBigSize);
+    else
+        return EmbeddedNNUE(gEmbeddedNNUESmallData, gEmbeddedNNUESmallEnd, gEmbeddedNNUESmallSize);
+}
+
 }
 
 
 namespace Stockfish::Eval::NNUE {
 
-const EmbeddedNNUE embeddedNNUEBig(gEmbeddedNNUEBigData, gEmbeddedNNUEBigEnd, gEmbeddedNNUEBigSize);
-const EmbeddedNNUE
-  embeddedNNUESmall(gEmbeddedNNUESmallData, gEmbeddedNNUESmallEnd, gEmbeddedNNUESmallSize);
-
 
 namespace Detail {
 
@@ -302,6 +320,8 @@ void Network<Arch, Transformer>::load_internal() {
         }
     };
 
+    const auto embedded = get_embedded(embeddedType);
+
     MemoryBuffer buffer(const_cast<char*>(reinterpret_cast<const char*>(embedded.data)),
                         size_t(embedded.size));
 
diff --git a/src/nnue/network.h b/src/nnue/network.h
index c1ed7717914..21e1c622205 100644
--- a/src/nnue/network.h
+++ b/src/nnue/network.h
@@ -34,27 +34,19 @@
 
 namespace Stockfish::Eval::NNUE {
 
-struct EmbeddedNNUE {
-    EmbeddedNNUE(const unsigned char* embeddedData,
-                 const unsigned char* embeddedEnd,
-                 const unsigned int   embeddedSize) :
-        data(embeddedData),
-        end(embeddedEnd),
-        size(embeddedSize) {}
-    const unsigned char* data;
-    const unsigned char* end;
-    const unsigned int   size;
+
+enum class EmbeddedNNUEType {
+    BIG,
+    SMALL,
 };
 
-extern const EmbeddedNNUE embeddedNNUEBig;
-extern const EmbeddedNNUE embeddedNNUESmall;
 
 template<typename Arch, typename Transformer>
 class Network {
    public:
-    Network(EvalFile file, EmbeddedNNUE embeddedEval) :
+    Network(EvalFile file, EmbeddedNNUEType type) :
         evalFile(file),
-        embedded(embeddedEval) {}
+        embeddedType(type) {}
 
     void load(const std::string& rootDirectory, std::string evalfilePath);
     bool save(const std::optional<std::string>& filename) const;
@@ -92,8 +84,8 @@ class Network {
     // Evaluation function
     AlignedPtr<Arch> network[LayerStacks];
 
-    EvalFile     evalFile;
-    EmbeddedNNUE embedded;
+    EvalFile         evalFile;
+    EmbeddedNNUEType embeddedType;
 
     // Hash value of evaluation function structure
     static constexpr std::uint32_t hash = Transformer::get_hash_value() ^ Arch::get_hash_value();
diff --git a/src/uci.cpp b/src/uci.cpp
index fda336b0d8e..cf0e3f09cc7 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -54,8 +54,8 @@ namespace NN = Eval::NNUE;
 
 UCI::UCI(int argc, char** argv) :
     networks(NN::Networks(
-      NN::NetworkBig({EvalFileDefaultNameBig, "None", ""}, NN::embeddedNNUEBig),
-      NN::NetworkSmall({EvalFileDefaultNameSmall, "None", ""}, NN::embeddedNNUESmall))),
+      NN::NetworkBig({EvalFileDefaultNameBig, "None", ""}, NN::EmbeddedNNUEType::BIG),
+      NN::NetworkSmall({EvalFileDefaultNameSmall, "None", ""}, NN::EmbeddedNNUEType::SMALL))),
     cli(argc, argv) {
 
     options["Debug Log File"] << Option("", [](const Option& o) { start_logger(o); });