Fix for new repo format

TODO: detect x86/x86_64