Fix Fruitjector cross-arch test and fine-grained OS detection