--- src/Nfc.cpp	(revision 24)
+++ src/Nfc.cpp	(working copy)
@@ -154,15 +156,9 @@
 
 std::string Nfc::Tag::getUid() {
 	std::string uid = "";
-	if(isClassic()) {
-		char* pUid = mifare_classic_get_uid (tag);
-		uid = pUid;
-		free(pUid);
-	} else if(isUltralight()) {
-		char* pUid = mifare_ultralight_get_uid (tag);
-		uid = pUid;
-		free(pUid);
-	}
+	char* pUid = freefare_get_tag_uid (tag);
+	uid = pUid;
+	free(pUid);
 
 	return uid;
 }