diff --git a/favro_sync/__init__.py b/favro_sync/__init__.py
index 95078c2..ed92f59 100644
--- a/favro_sync/__init__.py
+++ b/favro_sync/__init__.py
@@ -65,4 +65,4 @@ Following features are work in progress:
 """
 
 __all__ = ['__version__']
-from _version import __version__
+from ._version import __version__
diff --git a/favro_sync/favro_client.py b/favro_sync/favro_client.py
index 3446d24..0d80433 100644
--- a/favro_sync/favro_client.py
+++ b/favro_sync/favro_client.py
@@ -77,7 +77,7 @@ class FavroClient:
         read_only=True,
     ):
         # Check arguments
-        if not isinstance(favro_org_id, str):
+        if not isinstance(favro_org_id, OrganizationId):
             msg = f'favro_org_id must be str, but was {type(favro_org_id)}'
             raise TypeError(msg)
         if not isinstance(favro_username, str):