diff --git a/components/common/cpp/src/configuration.cpp b/components/common/cpp/src/configuration.cpp
index 20173db52ad3486eaf5c64be0b434ee7a58e964a..1d4bb01d69ded010d0a2745491a9d0979f3bcc5d 100644
--- a/components/common/cpp/src/configuration.cpp
+++ b/components/common/cpp/src/configuration.cpp
@@ -277,7 +277,6 @@ static void _indexConfig(json_t &cfg) {
 
 ftl::Configurable *ftl::config::find(const std::string &uri) {
 	if (uri.size() == 0) return nullptr;
-
 	std::string actual_uri = uri;
 	if (uri[0] == '/') {
 		if (uri.size() == 1) {
@@ -878,16 +877,13 @@ Configurable *ftl::config::configure(int argc, char **argv, const std::string &r
 	string root_str = (options.find("root") != options.end()) ? nlohmann::json::parse(options["root"]).get<string>() : root;
 	cfg_root_str = root_str;
 
-	if (!config.contains("$id")) {
-		config["$id"] = "ftl://utu.fi";
-	}
-
 	if (options.find("id") != options.end()) config["$id"] = nlohmann::json::parse(options["id"]).get<string>();
 	_indexConfig(config);
 
 	config_restore = std::move(ftl::loadJSON(std::string(FTL_LOCAL_CONFIG_ROOT "/")+cfg_root_str+std::string("_session.json")));
 
 	Configurable *rootcfg = nullptr;
+	rootCFG = rootcfg;
 
 	try {
 		rootcfg = create<Configurable>(config);