diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 3ee93d913..360c5a207 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -24,6 +24,7 @@ if(SUBMODULE_CHECK)
     check_submodule(oxen-mq)
     check_submodule(uvw)
     check_submodule(cpr)
+    check_submodule(ngtcp2)
   endif()
 endif()
 
@@ -74,3 +75,5 @@ target_link_libraries(cpr PUBLIC CURL::libcurl)
 target_include_directories(cpr PUBLIC cpr/include)
 target_compile_definitions(cpr PUBLIC CPR_CURL_NOSIGNAL)
 add_library(cpr::cpr ALIAS cpr)
+
+add_subdirectory(ngtcp2 EXCLUDE_FROM_ALL)
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 66ca4a0e4..f2d9493d5 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -28,19 +28,12 @@ add_dependencies(lokinet-util genversion)
 
 target_include_directories(lokinet-util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR})
 
-if(NOT TARGET sqlite3)
-  add_library(sqlite3 INTERFACE)
-  pkg_check_modules(SQLITE3 REQUIRED IMPORTED_TARGET sqlite3)
-  target_link_libraries(sqlite3 INTERFACE PkgConfig::SQLITE3)
-endif()
-
 target_link_libraries(lokinet-util PUBLIC
   lokinet-cryptography
   nlohmann_json::nlohmann_json
   filesystem
   date::date
   oxenmq
-  sqlite3
 )
 
 if(ANDROID)
@@ -229,7 +222,7 @@ if(WITH_HIVE)
   )
 endif()
 
-target_link_libraries(liblokinet PUBLIC cxxopts lokinet-platform lokinet-util lokinet-cryptography)
+target_link_libraries(liblokinet PUBLIC cxxopts lokinet-platform lokinet-util lokinet-cryptography sqlite_orm)
 target_link_libraries(liblokinet PRIVATE libunbound)