diff --git a/pysonic/api.py b/pysonic/api.py
index 289ca56..32906bd 100644
--- a/pysonic/api.py
+++ b/pysonic/api.py
@@ -117,7 +117,7 @@ class PysonicSubsonicApi(object):
         # artists just need this
         response.add_child("directory",
                            name=entity['name'],
-                           id=entity['id'])
+                           id=entity['dir'])
 
         if dirtype == "album":
             # albums can also have
@@ -136,7 +136,7 @@ class PysonicSubsonicApi(object):
             if childtype == "album":
                 moreargs.update(name=child["name"],
                                 isDir="true",  # TODO song files in artist dir
-                                parent=entity["id"],
+                                parent=entity["dir"],
                                 id=child["dir"])
                 if child["coverid"]:
                     moreargs.update(coverArt=child["coverid"])
@@ -417,7 +417,7 @@ class PysonicSubsonicApi(object):
 
         artists = 0
         for item in self.db.get_artists(name_contains=query):
-            response.add_child("artist", _parent="searchResult2", id=item["id"], name=item["name"])
+            response.add_child("artist", _parent="searchResult2", id=item["dir"], name=item["name"])
             artists += 1
             if artists >= artistCount:
                 break