(WIP, not tested) Clean up repo checks

Checking for the optional product identifier is wrong. Seems
like there was a repoid added for this purpose, so lets use that.