Improve `matrix` object

Since it basically has the same properties that the `block-list` object we can make proper use of the DRY principle and @extend it.