Use GUID from API instead of ID (bug 1056317)